Don't use contractions like "don't" or "isn't" in error messages. It isn't

Fri Jun 11 22:02:56 2004  Matthias Clasen  <maclas@gmx.de>

	* io-gif.c, io-pnm.c, io-tga.c, io-xpm.c: Don't use
	contractions like "don't" or "isn't" in error messages.
	It isn't nice to use them in log entries either...
	(#137774, Morten Welinder, patch by Alexander Winston)

diff --git a/ChangeLog b/ChangeLog
index e6186bd3480bb3ab66e8e762de0e5faeb09f3000..32d55a534d6806dc8d176ac32b860a46eed1b459 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 11 22:05:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserdefault.c: Don't use
+       contractions like "don't" or "isn't" in error messages.
+       It isn't nice to use them in log entries either...
+       (#137774, Morten Welinder, patch by Alexander Winston)
+
 2004-06-11  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #143578:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e6186bd3480bb3ab66e8e762de0e5faeb09f3000..32d55a534d6806dc8d176ac32b860a46eed1b459 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Jun 11 22:05:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserdefault.c: Don't use
+       contractions like "don't" or "isn't" in error messages.
+       It isn't nice to use them in log entries either...
+       (#137774, Morten Welinder, patch by Alexander Winston)
+
 2004-06-11  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #143578:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e6186bd3480bb3ab66e8e762de0e5faeb09f3000..32d55a534d6806dc8d176ac32b860a46eed1b459 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Jun 11 22:05:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserdefault.c: Don't use
+       contractions like "don't" or "isn't" in error messages.
+       It isn't nice to use them in log entries either...
+       (#137774, Morten Welinder, patch by Alexander Winston)
+
 2004-06-11  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #143578:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e6186bd3480bb3ab66e8e762de0e5faeb09f3000..32d55a534d6806dc8d176ac32b860a46eed1b459 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Jun 11 22:05:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserdefault.c: Don't use
+       contractions like "don't" or "isn't" in error messages.
+       It isn't nice to use them in log entries either...
+       (#137774, Morten Welinder, patch by Alexander Winston)
+
 2004-06-11  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #143578:

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 21c24afdbdc1bb8c961af9e3bcd2f5c6874a24dd..3a060d54268e70daf4e78dcbf4db66e87edc7d4c 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,4 +1,11 @@
- Sat Jun  5 00:59:12 2004  Matthias Clasen  <maclas@gmx.de>
+Fri Jun 11 22:02:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * io-gif.c, io-pnm.c, io-tga.c, io-xpm.c: Don't use
+       contractions like "don't" or "isn't" in error messages.
+       It isn't nice to use them in log entries either...
+       (#137774, Morten Welinder, patch by Alexander Winston)
+
+Sat Jun  5 00:59:12 2004  Matthias Clasen  <maclas@gmx.de>
  
        Merged from 2.4
 

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 28cd7e0a259293d7bca3fee75e2b0ff4e87bfbe0..8dd73bde05841f2ccebd010cfca92b21af8b5df6 100644 (file)
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -632,7 +632,7 @@ lzw_read_byte (GifContext *context)
                         g_set_error (context->error,
                                      GDK_PIXBUF_ERROR,
                                      GDK_PIXBUF_ERROR_FAILED,
-                                     _("GIF image loader can't understand this image."));
+                                     _("GIF image loader cannot understand this image."));
                         return -2;
                         
                        if (ZeroDataBlock) {

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index 39b7d363379db54b2c11cb9e304d0a41f229dc65..d65bb3da55d434ce77e43c1691f0db15d67495f4 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -393,7 +393,7 @@ pnm_read_header (PnmLoaderContext *context)
                                g_set_error (context->error,
                                             GDK_PIXBUF_ERROR,
                                             GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                            _("Can't handle PNM files with maximum color values greater than 255"));
+                                            _("Cannot handle PNM files with maximum color values greater than 255"));
                                return PNM_FATAL_ERR;
                        }
                }
@@ -767,7 +767,7 @@ gdk_pixbuf__pnm_image_load (FILE *f, GError **error)
                                g_set_error (error,
                                             GDK_PIXBUF_ERROR,
                                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                            _("Can't allocate memory for loading PNM image"));
+                                            _("Cannot allocate memory for loading PNM image"));
                                return NULL;
                        }
 

diff --git a/gdk-pixbuf/io-tga.c b/gdk-pixbuf/io-tga.c
index 99f413ce884f569989931f4c1aa0540b95e0d3f5..ef49e79315bb0f2699ea11d6f748a725524fa860 100644 (file)
--- a/gdk-pixbuf/io-tga.c
+++ b/gdk-pixbuf/io-tga.c
@@ -156,7 +156,7 @@ static IOBuffer *io_buffer_new(GError **err)
        if (!buffer) {
                g_set_error(err, GDK_PIXBUF_ERROR,
                            GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                           _("Can't allocate memory for IOBuffer struct"));
+                           _("Cannot allocate memory for IOBuffer struct"));
                return NULL;
        }
        buffer->data = NULL;
@@ -175,7 +175,7 @@ static IOBuffer *io_buffer_append(IOBuffer *buffer,
                if (!buffer->data) {
                        g_set_error(err, GDK_PIXBUF_ERROR,
                                    GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                   _("Can't allocate memory for IOBuffer data"));
+                                   _("Cannot allocate memory for IOBuffer data"));
                        g_free(buffer);
                        return NULL;
                }
@@ -186,7 +186,7 @@ static IOBuffer *io_buffer_append(IOBuffer *buffer,
                if (!tmp) {
                        g_set_error(err, GDK_PIXBUF_ERROR,
                                    GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                   _("Can't realloc IOBuffer data"));
+                                   _("Cannot realloc IOBuffer data"));
                        g_free(buffer);
                        return NULL;
                }
@@ -216,7 +216,7 @@ static IOBuffer *io_buffer_free_segment(IOBuffer *buffer,
                if (!new_buf) {
                        g_set_error(err, GDK_PIXBUF_ERROR,
                                    GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                   _("Can't allocate temporary IOBuffer data"));
+                                   _("Cannot allocate temporary IOBuffer data"));
                        g_free(buffer->data);
                        g_free(buffer);
                        return NULL;
@@ -350,7 +350,7 @@ static gboolean fill_in_context(TGAContext *ctx, GError **err)
 
        if (!ctx->pbuf) {
                g_set_error(err, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                           _("Can't allocate new pixbuf"));
+                           _("Cannot allocate new pixbuf"));
                return FALSE;
        }
 
@@ -689,14 +689,14 @@ static gboolean try_colormap(TGAContext *ctx, GError **err)
        ctx->cmap = g_try_malloc(sizeof(TGAColormap));
        if (!ctx->cmap) {
                g_set_error(err, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                           _("Can't allocate colormap structure"));
+                           _("Cannot allocate colormap structure"));
                return FALSE;
        }
        ctx->cmap->size = LE16(ctx->hdr->cmap_n_colors);
        ctx->cmap->cols = g_try_malloc(sizeof(TGAColor) * ctx->cmap->size);
        if (!ctx->cmap->cols) {
                g_set_error(err, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                           _("Can't allocate colormap entries"));
+                           _("Cannot allocate colormap entries"));
                return FALSE;
        }
 
@@ -736,7 +736,7 @@ static gboolean try_preload(TGAContext *ctx, GError **err)
                        if (!ctx->hdr) {
                                g_set_error(err, GDK_PIXBUF_ERROR,
                                            GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                           _("Can't allocate TGA header memory"));
+                                           _("Cannot allocate TGA header memory"));
                                return FALSE;
                        }
                        g_memmove(ctx->hdr, ctx->in->data, sizeof(TGAHeader));
@@ -858,7 +858,7 @@ static gpointer gdk_pixbuf__tga_begin_load(GdkPixbufModuleSizeFunc f0,
        if (!ctx) {
                g_set_error(err, GDK_PIXBUF_ERROR, 
                            GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                           _("Can't allocate memory for TGA context struct"));
+                           _("Cannot allocate memory for TGA context struct"));
                return NULL;
        }
 

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 5be7c48e53f957e19d8cb1d75fe82fd6d999f01a..40cd525f39d4a5b8bf7c8e6ab22d8a7a59644737 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -1276,7 +1276,7 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum buf_op op, gpointer handl
                         g_set_error (error,
                                      GDK_PIXBUF_ERROR,
                                      GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                     _("Can't read XPM colormap"));
+                                     _("Cannot read XPM colormap"));
                        g_hash_table_destroy (color_hash);
                        g_free (name_buf);
                        g_free (colors);
@@ -1314,7 +1314,7 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum buf_op op, gpointer handl
                 g_set_error (error,
                              GDK_PIXBUF_ERROR,
                              GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                             _("Can't allocate memory for loading XPM image"));
+                             _("Cannot allocate memory for loading XPM image"));
                g_hash_table_destroy (color_hash);
                g_free (colors);
                g_free (name_buf);

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index ed706aa1c66c25c157a1c4a2493c5f19551be31d..4c4b685a9efc09bc5b7d718b4afed0312cc92cc4 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3905,7 +3905,7 @@ gtk_file_chooser_default_set_current_folder (GtkFileChooser    *chooser,
       g_set_error (error,
                   GTK_FILE_SYSTEM_ERROR,
                   GTK_FILE_SYSTEM_ERROR_FAILED,
-                  _("Can't change to folder because it isn't local"));
+                  _("Cannot change to folder because it is not local"));
 
       return FALSE;
     }